Closes #186