Merge pull request #165 from Cook1fan/master

Steven
2014-07-16
Merge pull request #170 from 394802198/master

Steven