Build and updated changes

Updated to iOS6 compatibility