Updates for release 2014-05-19
Merge pull request #4 from dvbu-test/master

Updates for release 2014-05-19