updated build process

merge