trivial changes
Merge pull request #39 from FrodeSolheim/trivial

Trivial changes