Merge #3
Merge pull request #2 from liorbentov/master

Merge #3