Added control of elev and azim (line 654)