re
Merge pull request #228 from 394802198/master

2014-10-21
Merge pull request #219 from Cook1fan/master

2014-10-21