Update for upstream changes
Merge pull request #22 from adrientetar/upstream

Update for upstream changes