Merge pull request #39 from jaypipes/panic-at-the-disco

Merge pull request #39 from jaypipes/panic-at-the-disco #28