Merge branch 'development-0.1.1' of repositories.muehmer.net:bsmrgo/playground into development-0.1.1