Added property xml comments
Added additional constructors
Updated demo