Update master with recent improvements and develop branch