Upgraded to latest vanilli. Closes #1.