Merge pull request #1 from techdivision/master

Load changes from Hans
Switch to new version 0.5.7-beta2
Merge pull request #1 from wagnert/master

Switch to new version 0.5.7-beta2