Merge pull request #15 from morfikov/master

update
Merge pull request #6 from r4vi/master

sync