Border improvement

for issue #25