Fixes #168. bjmcmorran