Olofs changes
Merge branch 'master' of https://github.com/Suduki/bla