Add interpolation methods to model
Fix interpolate bug
Merge remote-tracking branch 'upstream/develop' into develop