model input considering new/old value
Merge branch 'master' into gh-pages