Merge pull request #44 from hipsterwannabe/dannyalxndr

Dannyalxndr