c70029f Merge pull request #38 from Xliff/master