Merge pull request #1 from caron/master

what the fuck is going on.