integrate further jusbib changes into development branch 2