merged master into BPF, changed README