Fuzss Merge pull request #34 from knarry/knarry-patch-1