Merge pull request #96 from 394802198/master

Steven
Merge pull request #95 from Cook1fan/master

Merge pull request #96 from 394802198/master