Fix for issue #8
Merge pull request #9 from ajardan/master

Fix for issue #8