Fix for issue #32
Merge pull request #33 from malaverdiere/develop

Fix for issue #32