comments -s -m comments

Signed-off-by: Alexander Skjolden <alex@plastboks.net>
Merge branch 'improvements' into develop