fix target-dir (2)
Merge branch 'develop'