Merge pull request #2 from CorruptingAcid/WorkingMicah

So this should get my code up to date