Design issues - part 1.
Merge pull request #21 from yanivgal/DesignAndCheckingIssues

Design issues - part 1.