re
Merge pull request #238 from 394802198/master

2014-11-07
Merge pull request #230 from Cook1fan/master

2014-11-07