Update NicoleBranch

Getting changes from master branch and placing into NicoleBranch