Merge branch tmp-merge

This branch updates BWT and solves bugs in data structures