Working version

Signed-off-by: Niklas Ekman <niklas.ekman@gmail.com>