debug #10
Merge pull request #435 from LI-HE/master

debug #10
Merge pull request #135 from ChrisBoesch/master

Updates