Merge pull request #1 from joaocpsantos/feature1

description change
change master
Merge pull request #2 from joaocpsantos/master

test