Fix #13
Merge pull request #17 from nderambure/master

Fix #13