Merge pull request #2 from manhertz/master

osszerakni?
Merge pull request #4 from manhertz/dev

Merge pull request #2 from manhertz/master