re
Merge pull request #236 from 394802198/master

2014-11-05
Merge pull request #228 from Cook1fan/master

2014-11-05