Merge pull request #1 from NerminGraca/master

1