Merge pull request #113 from Cook1fan/master

Steven
2014-05-22
2014-05-23
Merge pull request #118 from 394802198/master

Steven