Updated latest changes

Signed-off-by: Niko Rosvall <niko@newsworm.net>