1.0.0 release, merge develop into master