Merge pull request #1 from thecountchuckula/master