update master for 0.5