Build latest changes

Build latest changes from @andschwa

Signed-off-by: Jonas Kalderstam <jonas@kalderstam.se>