Fixes #24
Issue #4
Closes #1