Fixes #307
Merge branch 'next' of github.com:rtCamp/easyengine into next