Moar modifications for pull req #60