Merge Develop branch of sensorMLParser into the master branch