Merge? edit

This seems like a candidate for a merge with Caspar CJ 14. Opinions?