Fixed issue #47
Merge pull request #48 from lpellegr/master

Fix for issue #47