Update gold with john's newest changes. #52

Closed rocky1138 closed 9 years ago