Added Feature #1220 (backwards compatibility)
clearer variable names