Cleanup
Merge pull request #77 from efraimgentil/master

Cleanup