Merge pull request #69 from Cook1fan/master

Steven
Merge pull request #70 from Cook1fan/master

Steven
214-04-22
Merge remote-tracking branch 'origin/master'
Merge pull request #75 from 394802198/master

Steven