Closes #22