Merge pull request #17 from marble/master

Fix typo in documentation
Fixed some templeate issues to be released as v0.3.1.
Merge pull request #2 from abakan/master

Catch up with abakan