Merge pull request #1 from chriswhsu/develop

from Develop
Merge pull request #2 from chriswhsu/develop

Develop
Merge branch 'develop'
Merge branch 'develop'
Merge branch 'develop'
provide tolerance for drop in net energy.
Merge branch 'master' into develop