fix target-dir
Merge branch 'develop'