Issue 60

Fixes #60.