Merge pull request #56 from 394802198/master

Steven
re
re
Merge pull request #49 from Cook1fan/master

Steven