Incorporated the changes for detecting Mobile Device properties.