Merge pull request #191 from lynxis/for-upstream