Merge pull request #124 from timeu/bugfix_upstream