Fix for issue #81
Merge pull request #83 from svanharmelen/fix-issue-81

Fix for issue #81