Fiddling with borders
Merge pull request #33 from mr-mr/ccbranch

Fiddling with borders