hax
Merge pull request #6 from gory/master

hax