updates
fixed master@