Merge pull request #124 from siduction-upstream/master