Merge pull request #78 from Cook1fan/master

Steven
2014-04-24
2014-04-24
Merge pull request #82 from 394802198/master

Steven