Merge pull request #3 from stephandev/master

Added more procedures in ENGINES, APU
Clean up + improvements
Merge pull request #104 from mshamash/master

Clean up + improvements