Fixes #113. Closes #114.