Jas 23

fixes #23