Merge pull request #129 from 394802198/master

Steven
Merge pull request #126 from Cook1fan/master

Merge pull request #129 from 394802198/master