Merge pull request #29 from cinecert/htj2c