Merge pull request #75 from 394802198/master

Steven
Merge pull request #71 from Cook1fan/master

Merge pull request #75 from 394802198/master