Shane is back
Merge pull request #4 from cmcilhenny/shane

Shane is back