Updated initializer as per https://gist.github.com/radar/5523054