some changes
Merge pull request #11 from IsabelLage/master

Fixed files