revised
Merge remote-tracking branch 'upstream/master'
Merge pull request #69 from pisi79/master

revised