Merge pull request #1 from cinecert/master