Border updates - Version 5.4

Fixes #17