Xcode 5 fixes for issues #14 and #4 plus a strange crash on retina devices