Merged changes from master correctly