Merge pull request #20 from raphaelm/master
Merge branch 'raphaelm-master'