Merge pull request #7 from nilportugues/master

Does this starts the road to 1.1?
Merge pull request #8 from nilportugues/v1.0

Merge pull request #7 from nilportugues/master