Merge branch 'master' of https://github.com/zakk/beyond.git