Merge pull request #9 from techdivision/0.5.8-beta

Remerging with zelgerj/kreidenhubert