Closes #184