Merge pull request #129 from frodenas/master

Two minor fixes