Behzad's code commit for Sensor Data Parser