Merge pull request #172 from 394802198/master

Steven
Merge pull request #168 from Cook1fan/master

Merge pull request #172 from 394802198/master