Fixed build script.,
Merge branch 'dev'