Fixed things
Merge origin/master
Fixed more things