Revert "Fix issue #14"
Merge pull request #16 from drmeister/revert-15-bugfix-14

Revert "Fix issue #14"