Merge development into master

Merging all code into master.