overlay algorithm more robust.
XMerge branch 'master' of github.com:katjahahn/PortEx