Merge pull request #7 from ctesniere/master

Merge