Merge pull request #45 from ChrisBoesch/master

update
Merge pull request #192 from ruijunhuang2010/master

Merge pull request #45 from ChrisBoesch/master
Merge pull request #71 from ChrisBoesch/master

Updates