Merge pull request #28 from Cook1fan/master

Steven
2014-03-18
Merge pull request #40 from 394802198/master

Steven