sync aaroncarey-patch-1 to master #26

Closed aaroncarey closed 6 years ago