Merge pull request #2 from ecomfe/develop

lf
Merge branch 'master' into develop