Make release 2.5.8
Merge pull request #173 from balshetzer/master

Make release 2.5.8