Merge pull request #156 from Cook1fan/master

Steven
2014-07-09
Merge pull request #162 from 394802198/master

Steven