Merge pull request #32 from komatits/devel

final cosmetic changes