update from rustici master