Merge pull request #1 from janisz/master

ok
Merge pull request #3 from upstreamfall/master

Merge pull request #1 from janisz/master