Pull develop into master, initial release