Closes #53