Development thijl

fixes #69