Merge pull request #5 from NerminGraca/master

Merge pull request #11 from nldn/master
Merge pull request #12 from nldn/master

Merge pull request #5 from NerminGraca/master