Merge pull request #36 from rcarmo/master

Merging changes from @rcarmo