Merge branch 'spatially_smooth' of ssh://github.com/amonszpart/globOpt into spatially_smooth
Merge branch 'spatially_smooth' of ssh://github.com/amonszpart/globOpt into spatially_smooth