Merge pull request #412 from intportg/dev

Dev