oooh yay
Merge pull request #1 from fcharlier/feature

oooh yay