Merge pull request #6 from nicolas-t/master

badger :3