Merge pull request #167 from Cook1fan/master

Steven
2014-07-18
Merge pull request #172 from 394802198/master

Steven