Misc fixes.
Merge pull request #10 from y-p/patch-1

Misc fixes.