Shields are up!
Merge pull request #27 from Lancelot825/master

Shields are up, Captain!