Updating Branch Caroline

Merging all changes added to master into branch Caroline.