Closes #165