Refactored, updated to latest oct2py API