Merge pull request #31 from komatits/devel

cosmetic changes to be able to use "meld" more efficiency to apply an ol...