Merge pull request #5 from ofirl/maorTests

Maor tests
Merge branch 'master' into maorTests