Merge pull request #14 from wick-ed/0.5.8-beta

reviewed with 0.5.8-beta6
Merge pull request #1 from techdivision/0.5.8-beta

Merge pull request #14 from wick-ed/0.5.8-beta