Closes #181