Refactor single property code to be consistent with nested property code
Merge pull request #33 from amageed/v0.3.0

Refactor single property code to be consistent with nested property code