Merge pull request #124 from Cook1fan/master

Steven
2014-06-07
Merge pull request #128 from 394802198/master

Steven