closes #1
Closes #22