Merge pull request #1 from mach327/master

huh