Merge pull request #8 from LudovicRousseau/master

Fix for issue #7