Merge pull request #1 from 64j/master

upd