Merge pull request #225 from Cook1fan/master

2014-11-04
2014-11-04
Merge pull request #234 from 394802198/master

2014-11-04