QA and Dominique’s changes
Merge pull request #3 from rachellewhite/master

QA and Dominique’s changes