Rick-2CA

I've rolled back PR #36 in the development branch after testing and discussing the changes with the submitter. As a result of the discussion we should consider the following two...