Merge pull request #4 from cinecert/master