comments #29 - some comment work

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