Committing changes needed to merge into master