merged develop into master for Squiggly