Merge pull request #154 from Cook1fan/master

Steven
2014-07-08
Merge pull request #160 from 394802198/master

Steven