Merge pull request #63 from 394802198/master

Steven
Merge pull request #58 from Cook1fan/master

Merge pull request #63 from 394802198/master