change back #2
Merge pull request #342 from LI-HE/master

change back #2
Merge pull request #108 from ChrisBoesch/master

Updates