Changes made from demo
Merge branch 'dev' of https://github.com/Castronova/EMIT into dev