Let's get this party started
Merge pull request #26 from adrexia/patch-3

Let's get this party started