Merge pull request #1 from ondras/master

Merge from fork source...