Henk&chii changes pull

Pull of all the changes made by henk and chii