Merge pull request #3 from techdivision/0.5.8-beta

Remerge with master