Merge with master, started working on Threading and Text