Merge pull request #3 from sjewo/testing

Merge release 0.4 Public Beta from testing