Merge pull request #239 from timeu/bugfix_upstream