Merge Yuk's commits

Pull request #104