add ADD and MULT operators; fix #23