Merge pull request #150 from Cook1fan/master

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

Steven