AssignArrStm + merge now
Merge branch 'master' of github.com:MInner/cmp
aftermerge + bugfix ^_^