fix sha method
Merge origin/master