Merging in changes from sadlerjw remote

See sadlerjw#1