Merge pull request #7 from nilportugues/master

Does this starts the road to 1.1?