added pump support to simc
Merge branch 'master' into 1.0