Merge branch 'master' of https://gist.github.com/6996863 into oliversalzburg