implemented JaJ, fixes #54