Merge pull request #18 from ChrisBoesch/master

update
Merge pull request #425 from ruijunhuang2010/master

Merge pull request #18 from ChrisBoesch/master
Merge pull request #131 from ChrisBoesch/master

Updates