update to libsodium 0.6.1 and merge functionality from the package done by @damianorenfer