Merge pull request #133 from Cook1fan/master

Steven
2014-06-17
Merge pull request #137 from 394802198/master

Steven