ISSUE #47:Fixing problems related to properties not matching between UI and data.
Merge pull request #51 from lremedi/master

Issue #47 fixed