Merge pull request #1 from knugie/spike

Spike