Updates to use the new sodium 0.2.0 interface
A Merlin description