merge with master
Update preference bangatext