Merge pull request #12 from bdukes/master

Version 5.8.7