change
Merge pull request #7 from mediapeers/hotfix/1232b

New feature stuff