Moving back to engine project...
Merge pull request #26 from jpav/master

Moving back to engine project...