Merge pull request #92 from Edzelopez/RG-116

RG-116 Fixed other fields fubctionality