Merging proposed changes into master for review