Merge pull request #36 from 394802198/master

Steven
Merge pull request #23 from Cook1fan/master

Merge pull request #36 from 394802198/master