Merge pull request #83 from Cook1fan/master

Steven
Merge pull request #84 from Cook1fan/master

re
2014-05-06
2014-05-06
Merge pull request #88 from 394802198/master

Steven