Design issues - part 6.
Bug Fix.
Merge pull request #27 from yanivgal/DesignIssuesPart6

Design issues part6