vote fixed
Merge branch 'Brian'