Merge pull request #120 from timeu/bugfix_upstream