re
Merge pull request #225 from 394802198/master

2014-10-16
Merge pull request #216 from Cook1fan/master

2014-10-16