Merge pull request #127 from Cook1fan/master

Steven
2014-06-10
Merge pull request #131 from 394802198/master

Steven