Updated variable and domain, fixes #40
Updated variable and domain, fixed #41