Corrected build_dir path
Merge remote-tracking branch 'oti/master'