Merge pull request #1 from dvbu-test/master

Synchronize with master
Updated license to EPL