Merge pull request #54 from komatits/devel

cosmetic changes