Merge pull request #123 from Cook1fan/master

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

Steven