Updated build script to work on current branch