Design issues - part 4.
Merge pull request #24 from yanivgal/DesignIssuesPart4

Design issues - part 4.