Merge pull request #2 from ecomfe/master

update