Fix for issue #20
Merge pull request #22 from svanharmelen/development

Fix for issue #20