Merge pull request #6 from lequoclap/master