Closes #67