Merge pull request #102 from 394802198/master

Steven
Merge pull request #101 from Cook1fan/master

Merge pull request #102 from 394802198/master