guillaumechereau Merge pull request #9 from mathkr/master