Task #120: Remove border where we don't need it
Merge branch '120' into test