Fixes #175. bjmcmorran