Merge pull request #535 from mayeut/converttif