Merge pull request #1 from fealza/develop

dev by fealza