Merge pull request #5 from kylestlb/master

Update NicoleBranch
Merge pull request #6 from kylestlb/NicoleBranch

Merge pull request #5 from kylestlb/master