Merge pull request #11 from ChrisBoesch/master

update
Merge pull request #63 from LI-HE/master

Change back