Xcode 6.1 beta 2 change + notification handler marked as private

First change is about compatibility with new Xcode, and the second change makes notification handler method private.
Keeping it as is for now, since this is a change in the next Beta of XCode. Want to make sure it works in the GM version. Will merge in once the GM version is upgraded. Thanks!