Merge pull request #54 from ChrisBoesch/master

update
Merge pull request #350 from ruijunhuang2010/master

Merge pull request #54 from ChrisBoesch/master
Merge pull request #111 from ChrisBoesch/master

Updates