Merge pull request #3 from NerminGraca/master

all
Merge pull request #10 from nldn/master

Merge pull request #3 from NerminGraca/master