Fixes #176. bjmcmorran