Merge pull request #25 from chaoaero/master

merge the master branch