Resolves #189