Feature/jglr

resolves #5