fixed dir issue
Merge remote-tracking branch 'aivb/master'