test fix
Merge pull request #37 from pedronasser/master

test fix and other fixes.