Added Stuff
Merge branch 'myDev'