lisätty bullet
Merge branch 'feature-toka'