Merge pull request #129 from Cook1fan/master

Steven
2014-06-11
Merge pull request #133 from 394802198/master

Steven