Merge pull request #91 from Cook1fan/master

Steven
2014-05-08
Merge pull request #93 from 394802198/master

Steven