Merge pull request #155 from way2muchnoise/1.7-update

Lang updates