border work
Merge pull request #75 from HoltMaki/master

border work