Merge pull request #92 from viniband1/development

US-13