cescoffier Merge pull request #38 from cescoffier/q3