Design Issues - part 3.
Merge pull request #23 from yanivgal/DesignIssuesPart3

Design Issues - part 3.