Fixed bug.
Fixes #36
Merge branch 'develop' of git://github.com/johnshopkins/machado into develop