Merge pull request #240 from timeu/bugfix_upstream