synced with oscam-emu
Merge pull request #52 from jahntheman/master

synced with oscam-emu