new changes
Merge pull request #8 from orenkl/feature/adhamh

new changes