merging develop into master. Long overdue.