Merge pull request #21 from flymke/dev

Dev
Merge branch 'dev'
Merge branch 'dev'
Make border height variable