Closes #153