Merge pull request #90 from Cook1fan/master

Steven
2014-05-07
Merge pull request #92 from 394802198/master

Steven