Merge pull request #3 from dgilperez/emjot-stable

Fixing #2
Fixes #4