Merge pull request #3 from techdivision/0.5.8-beta

Remerge with master
Merge pull request #45 from wagnert/0.5.8-beta

Merge pull request #3 from techdivision/0.5.8-beta