Merge pull request #166 from 394802198/master

Steven
Merge pull request #161 from Cook1fan/master

Merge pull request #166 from 394802198/master