Merge pull request #20 from adao1123/swirlie

Swirlie & Spike