commit from branch
Merge pull request #9 from orenkl/feature/tali

commit from branch