Merge pull request #16 from EladElrom/develop

Develop
Merge pull request #17 from EladElrom/develop

develop
Merge pull request #19 from EladElrom/master

master