Fixat boka formet design
Merge remote-tracking branch 'origin/master'