Merge pull request #3 from cinecert/master