Fix some bugs for release.

Fix bugs and docs.
Merge pull request #6 from hemslo/feature/fix_bug

Fix some bugs for release.