Merge pull request #115 from Cook1fan/master

Steven
Merge pull request #116 from Cook1fan/master

re
2014-05-26
Merge pull request #120 from 394802198/master

Steven