Merge pull request #27 from ChrisBoesch/master

update
debug #9
Merge pull request #433 from LI-HE/master

debug #9
Merge pull request #134 from ChrisBoesch/master

Updates