more changes
Merge pull request #5 from orenshk/best-branch

more changes