fixed cache in program working directory
file name change
Merge branch 'dev'