more corrections
Merge pull request #3 from VegarS/master

More corrections