Merge branch 'release-0.3'
Merge branch 'master' of https://github.com/ekleinod/basis into feature-redesign