Merge pull request #1 from IldikoGyore/master

NEM Dike commit
Gabor commitja
Merge pull request #1 from GaborSzalay/master

Gabor pull request