refactoring objects and minor changes
Merge pull request #2 from EladElrom/develop

refactoring objects and minor changes