Merge pull request #3 from alexmwu/master

finally fix webpage problems
Merge pull request #4 from alexmwu/master

v0.2 merge
Merge pull request #5 from alexmwu/gh-pages

merge gh into master v0.2