Merged develop into master for Beta release