Merge pull request #179 from 394802198/master

Steven
Merge pull request #175 from Cook1fan/master

Merge pull request #179 from 394802198/master