edits from tormod
Merge branch 'master' of https://github.com/sjurlur/master