fixed unreachable code in build.py
merged buildfix