shabai's changes
more changes
Merge Shabai's changes

Merge changes + a few tweaks
Merge branch 'master' into esegev