Merged pull request #32 and #33 using kdiff