LOL
Merge pull request #2 from dcolish/feature-3

LOL