Change from nr1
Merge branch 'master' of github.com:simonkrenger/martin-test