omg new stuf

harharhar
Merge pull request #2 from brandon-clair/derf-herping

omg new stuf MERGED