added jupitable class
Fixed merge conflicts