Merge branch 'master' of https://gist.github.com/6241605