Closes #3

Closes #24