Minor changes after code review
fixed for the other shapes
Merge pull request #1 from mihailirinchev/nirinchev/Minor-fixes

Minor changes after code review