Closes #187