formatting

Signed-off-by: Jonas Kalderstam <jonas@kalderstam.se>
Merge branch 'dev'