Merge pull request #11 from Cook1fan/master

Steven
2014-03-11
Merge pull request #26 from 394802198/master

Steven