merged epi-branch from alex into my imgcoord