Merge pull request #132 from Cook1fan/master

Steven
2014-06-16
Merge pull request #136 from 394802198/master

Steven