Merge pull request #142 from 394802198/master

Steven
Merge pull request #140 from Cook1fan/master

Merge pull request #142 from 394802198/master