comments #2 - a bit of badazzle

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