merge with master #43

Closed starkingwx closed 11 years ago