Fixes #34.
Merge.