first changes by assaf
Merge pull request #1 from sassyn/assaf_changes

first changes by assaf