Merge pull request #93 from komatits/devel

added the two suggestions made by Elliott