Jas#5

This fixes issue #5