Merge pull request #3 from Pickra/master

broken again