Upgrade to 1.5.8-SNAPSHOT
Merge pull request #51 from maginatics/1.5.8-snapshot

Upgrade to 1.5.8-SNAPSHOT