Merge pull request #100 from valdergallo/master

fixes #98