merged upstream
added build script