Merge branch 'esegev'
added pic
Changes discussed over skype

Added dynamic headers and might've fixed email - someone test this
Merge branch 'master' into esegev