per capita fixes
Merge remote-tracking branch 'upstream/master'
Merge pull request #309 from jpecht/master

per capita fix