Merge pull request #530 from intportg/dev

Dev