Committed too fast...
Merge pull request #7 from domistiller/upstream

Committed too fast...