* updated to latest sword master