supports stiffness property
cleanup
Merge branch 'master' into barz-master