re
Merge pull request #232 from 394802198/master

2014-11-03
Merge pull request #224 from Cook1fan/master

2014-11-03