re
Merge pull request #199 from 394802198/master

2014-06-27
Merge pull request #191 from Cook1fan/master

2014-06-27