Merge pull request #73 from 394802198/master

Steven
Merge pull request #68 from Cook1fan/master

Merge pull request #73 from 394802198/master