Merge pull request #179 from Cook1fan/master

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

Steven