Fixes #3
Merge pull request #4 from NicoVermeir/Dev

Fixes #3