Merge develop into master and create release v1