fix spell error
fix macro to support ARC project with StaticLibrary
Merge branch 'master' into arc