Merging changes to installation checker