Merge pull request #26 from johannesodland/master

Some small fixes