Merge develop for first working release