Bump version number
Merge branch 'release-0.5.8'

* release-0.5.8:
  Bump version number
Make anal changes