Merge pull request #2 from andirotter/master

update
Merge pull request #10 from winkelement/master

Merge pull request #2 from andirotter/master