Merge pull request #1 from tonimunthi/develop

merge to develop