Merge pull request #8 from cbrunet/master