Merge pull request #1 from Ecodev/master

merge with latest ecodev:master