Modified to get the Current Machine Name and User

Modified to get the Current Machine Name and User