Update for final version of issue 12

Signed-off-by: Dries Vints <dries.vints@gmail.com>