Merging master into devline1
Merge remote-tracking branch 'origin/master' into Devline1
Merge pull request #5 from Datenheld/Devline1

Merging Devline1