Minor bug fixes.
Merge pull request #31 from wpk-/master

Minor bug fixes.