Fix parsing of ODL-style properties

Resending change requested in pull request #266 from a new branch so as to contain only my changes. Made a couple of corrections too.