remove magic strings
Merge branch 'master' of https://www.github.com/skrogh/02102
Merge branch 'master' of https://www.github.com/skrogh/02102
final commit
DONE! :)