attempt to merge develop into master - getting all changes committed