Updated fetch branch with latest changes on master

Made the fetch branch up to date with the latest changes in master.