Merge pull request #134 from timeu/bugfix_upstream