fixed even more problems that appeared with the last dir fix. seems ok now
Merge branch 'master' into myblog
removed the uneeded file merged from master