Closes #167