Updated

Updates. Code  now compiles on current (May 2013) Xcode without
problems and is using ARC.