Merge branch 'master' into add-unlink-4
Merge pull request #14 from vitaliyg/add-unlink-4

Merge branch 'master' into add-unlink-4