Merge pull request #2 from elpesci/master

update
Merge branch 'origin/master'