I believe so. It has been quite some time since I've graduated but I assure you that you are picking the right field. You can do almost anything with a mechanical engineering degree. Focusing on a specific field like petroleum engineering may seem like a good idea at first but if the oil industry fails you might be out of luck. You can do a lot more with a mechanical degree.