Merge branch 'feat/property_parser'