Fixes #219
Merge pull request #220 from tristanvanbokkem/issue219

Fixes #219