Merge pull request #141 from Cook1fan/master

Steven
2014-06-24
Merge pull request #144 from 394802198/master

Steven