Merge pull request #107 from siduction-upstream/master