re
Merge pull request #237 from 394802198/master

2014-11-06
Merge pull request #229 from Cook1fan/master

2014-11-06