Merge pull request #107 from Cook1fan/master

Steven
2014-05-19
Merge pull request #110 from 394802198/master

Steven