May fixes #55 and #50
Merge pull request #56 from titoBouzout/master

Fixes #55 and #50