Merge pull request #123 from 394802198/master

Steven
Merge pull request #120 from Cook1fan/master

Merge pull request #123 from 394802198/master