Merge pull request #38 from Cook1fan/master

Steven
2014-03-27
Merge pull request #48 from 394802198/master

Steven