Merge 1.0.1

Fixes for issues #1 and #3.