Merge #4
Merge pull request #7 from liorbentov/master

Merge #4