1.8.7 compatibility
Merge pull request #17 from dickeyxxx/1.8.7

1.8.7 compatibility