Update master for better cleaning