Closes #196