Fixed some issues with iOS6
Changed namespace to avoid collision