Feature added by Fredde
One more thing
Merge branch 'freddes-feature' of github.com:nfredrik/helloword