Merge pull request #7 from bjornblomqvist/small-fixes

Small fixes