Changed some stuff
Merge master