Design issues - part 5.
Merge pull request #25 from yanivgal/DesignIssuesPart5

Design issues - part 5.