captainhagbard has been in Paris
Merge pull request #47 from timoschilling/captainhagbard_paris

captainhagbard has been in Paris