Merge pull request #55 from 394802198/master

Steven
Merge pull request #47 from Cook1fan/master

Merge pull request #55 from 394802198/master