Fix for issue #24
Merge pull request #25 from mirego/fix-issue-24

Fix for issue #24