Merge pull request #8 from techdivision/0.5.8-beta

Remerge with torminator
Merge pull request #60 from wagnert/0.5.8-beta

Merge pull request #8 from techdivision/0.5.8-beta