Shapes replace circles
Merge pull request #11 from nf1213/master

Shapes replace circles