re
Merge pull request #194 from 394802198/master

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

2014-06-27