Merge pull request #8 from Cook1fan/master

Steven
2014-03-06
Merge pull request #22 from 394802198/master

2014-03-06