FIxed some things
Merge origin/master