Fixed Issue #6
Merge branch 'master' of github.com:egenvall/ProjektIT