Added  variables as requested in issue 1 enhancement request.