Merge pull request #117 from Cook1fan/master

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

Steven