implements Issue16

the implementation for #16