brians change
Merge pull request #1 from bergeron/master

brians change