added my shit
fixed bug
fixed bug
Merge pull request #2 from six0h/master

from cody