Fixing #184
Merge pull request #16 from peteruithoven/develop

Fixing #184