Closes #37
Fixes #38