Tab/space fix
Merge branch 'master' of localhost:loikka-demo