Update master
cater to olivier's formatting whims
Merge pull request #1 from aimeesimone/patch-2

Update master