Merge pull request #159 from Cook1fan/master

Steven
2014-07-12
Merge pull request #165 from 394802198/master

Steven