Fixes #103, fixes #113.
Merge pull request #2 from xanthipe/master

Fixes #103, fixes #113.