Merge pull request #157 from Cook1fan/master

Steven
2014-07-10
Merge pull request #163 from 394802198/master

Steven