Finished 3.1
Modified build script