Merge TobiasRaeder/master into smartrevolution/master