Revert "Close issue #21"

This reverts commit 5da74470a580688c4f10cd88384862b9f66c9992.
Fixes issue #21