Merge pull request #98 from buhman/bugz

bugz