Fixes #4
Merge pull request #6 from tristanvanbokkem/work1

Fixes #4