Merge pull request #2 from ShawnEllis/toMerge

Merge branch 'master', remote-tracking branch 'origin/master'
Merge branch 'master', remote-tracking branch 'origin/master'
Merge branches 'toMerge' and 'master' into toMerge