Merge pull request #8 from techdivision/0.5.8-beta

Remerge with torminator