Merge branch 'master' of https://github.com/AHeise/stratosphere-sopremo