Merge pull request #141 from 394802198/master

Steven
re
Merge remote-tracking branch 'origin/master'
Merge pull request #139 from Cook1fan/master

Steven