Closes #189