Merge branch 'master' of https://github.com/fastflo/emma
Merge remote-tracking branch 'origin/master'
Few fixes and cleanup