Issue/#36

Fixes #36 and others. Updated list of variables