Merge pull request #194 from Cook1fan/master

2014-09-02
2014-09-03
Merge pull request #204 from 394802198/master

2014-09-03