Merge to master

Merge all the Stuff done inbetween to master branch.