Merge Develop into Master

Development branch is stable and ready for merging into master.