New version

Big changes to caption and pagination addons + small fixes