Merge pull request #148 from Cook1fan/master

Steven
2014-07-04
Merge pull request #154 from 394802198/master

Steven