Merge pull request #579 from mayeut/lossless