Merge pull request #100 from Cook1fan/master

Steven
2014-05-13
Merge pull request #102 from 394802198/master

Steven