Jas 24

Fixes #24