Merge pull request #40 from 394802198/master

Steven
Merge pull request #29 from Cook1fan/master

Merge pull request #40 from 394802198/master