JonasCz Merge pull request #7 from h1z3y3/master