Merging chetan's installation updates