Merge pull request #1 from borisyankov/master

upstream pull request