Merge pull request #604 from ndawe/master

simplify graph arithmetic operations
set ShapeSys constraint with string