isaacs: https://gist.github.com/2955745 updated