Fix merge for interpolation.cpp

Should fix #6
Merge pull request #7 from gjankowiak/patch-1

Fix merge for interpolation.cpp