Updated Caption engine (fixes #26)