Interpolator

Implementing Issue #266
Probably needs to be updated to current master.