Misc fixes.
Merge pull request #2 from ZPZ-Gr2/v0.2.0

Misc fixes.