Merge pull request #25 from chaoaero/master

merge the master branch
Merge pull request #26 from chaoaero/gh-pages

Merge pull request #25 from chaoaero/master