Border #62

Merged
merged 8 commits into from Nov 15, 2013