Merge pull request #136 from Cook1fan/master

Steven
2014-06-23
Merge pull request #140 from 394802198/master

Steven