Merge pull request #15 from Cook1fan/master

Steven
Merge pull request #30 from 394802198/master

Steven