Merge pull request #77 from seezer/bug821