Update Lingor Code (Part 7) / Fix #1 #6