removed prefix from names.
Merge branch 'master' of https://github.com/Rymdsnigel/Labb_4_WS