Closes #157