Merge branch 'master' into Tobias
Added some  comments
Merge branch 'Tobias'