Merging latest changes from CocoaLumberjack project