Addition of defocus files.
Merge dev of github with the local branch 'dev'