Restore Xcode 4 support
Update Demo