Merge pull request #156 from 394802198/master

Steven
Merge pull request #151 from Cook1fan/master

Merge pull request #156 from 394802198/master