Some really minor changes and fixed the wrapper to work with Wittmann's opacities