Merge pull request #181 from 394802198/master

Steven
Merge pull request #177 from Cook1fan/master

Merge pull request #181 from 394802198/master