Merge pull request #48 from komatits/devel

cosmetic changes to be able to later apply an old patch from Thomas Gill...