Fixes #13 - ARC support