Merge pull request #144 from Cook1fan/master

Steven
Merge pull request #145 from Cook1fan/master

re
2014-07-02
Merge pull request #151 from 394802198/master

Steven