Update to master for fixes