After review 1
Merge pull request #1 from viktorklang/master

Changes from Viktor Klang