Test case from jpierson regarding issue #60.
Fixes #60.
Version bump.
Warning removed.
Version bump for the future release.
Merge branch 'master' into issue54
Surrogate based on jpierson's implementation.