Merge pull request #178 from Cook1fan/master

Steven
2014-08-05
Merge pull request #183 from 394802198/master

Steven