Added APC support
Merge branch 'marranada'