Merge pull request #118 from Cook1fan/master

Steven
2014-05-29
Merge pull request #122 from 394802198/master

Steven