Development thijl

fixes #130