Fixed issue #49
Merge pull request #50 from EJEHardenberg/dev

Fixed issue #49