Updated to be compatible with Elcodi~0.3
Merge pull request #22 from elcodi/feature/compatible-with-elcodi-0-3

Updated to be compatible with Elcodi~0.3