test from johan
Merge branch 'master' of github.com:rutsch/philipsworldmap
test 2