Merge pull request #3 from doron123/master

Merge pull request #1 from xenia123/master