some last comments from lilach
Merge branch 'master' of https://github.com/yoavram/ESEB2013