Jas 15

fixes #15