Merge pull request #1 from janisz/master

ok