Merge pull request #2 from cinecert/master