Merge pull request #20 from cinecert/htj2c