Changes

Changes that has been made to master, should be in develop also