Adde user defined attributes order support
Merge pull request #83 from Strech/user-defined-properties-order

Adde user defined attributes order support