Merge pull request #152 from 394802198/master

Steven
Merge pull request #147 from Cook1fan/master

Merge pull request #152 from 394802198/master