Merge pull request #444 from evoskuil/master

Update tools versioning and libsodium paths.