comments #8 - updated files

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