Malvin bug fix
Merge branch 'master' of https://github.com/djjoe/Jozsef_Attila_vedes