Fix for Xcode 6
Cleanup
Changed log
Doc