merge with master #54

Closed starkingwx closed 11 years ago