Merge pull request #14 from morfikov/master

update
Merge pull request #5 from r4vi/master

sync