Merge pull request #152 from Cook1fan/master

Steven
2014-07-08
Merge pull request #158 from 394802198/master

re