Merged changes from myself