Issue 188 squash

Clean squash for #189