Merge pull request #143 from Cook1fan/master

Steven
2014-07-01
Merge pull request #150 from 394802198/master

Steven