Merge pull request #220 from hizzlekizzle/master