Run on 1.8.7
Merge pull request #1 from jgn/jn-1.8.7

Run on 1.8.7