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