Fix issue #6
Merge pull request #21 from svanharmelen/development

Fix issue #6