Fix for issue #5
Merge pull request #6 from caouecs/develop

Fix for issue #5