Merge pull request #128 from 394802198/master

Steven
Merge pull request #125 from Cook1fan/master

Merge pull request #128 from 394802198/master