Merge pull request #22 from delasky/master

pulling down
commiting changes to engine.js
merge conflicts
Merge pull request #25 from delasky/danielworking

Danielworking