Merge pull request #427 from fehguy/master

added header, model, property extensions