0c05711 Merge pull request #42 from Xliff/master