Development merge

Merges changes made in the development branch.