Update to current

Tried to do this: http://stackoverflow.com/a/21131381/4245061