Fixes #163. bjmcmorran