Fixed bug related to interpolation.
Merge branch 'master' of https://github.com/jcollard/unm-hip