Tomer last try

Merging the latest feature branch to Master.