Merge pull request #130 from Cook1fan/master

Steven
2014-06-13
Merge pull request #134 from 394802198/master

Steven