Added support for rectangular and elliptic borders
Merge pull request #13 from Mathe172/master

Support for elliptic and rectangular border shapes