Merge branch 'master' into laurissa
Merge pull request #1 from Laulitz/laurissa

Merge branch 'master' into laurissa