Oleg's file
Merge pull request #9 from ogusak/master

Changes from Oleg