Merge pull request #93 from Cook1fan/master

Steven
2014-05-09
Merge pull request #95 from 394802198/master

Steven