Merge pull request #9 from techdivision/0.5.8-beta

Remerging with zelgerj/kreidenhubert
Merge pull request #62 from wagnert/0.5.8-beta

Merge pull request #9 from techdivision/0.5.8-beta