First working version

Signed-off-by: Frank de Brabander <debrabander@gmail.com>