Fixes #126. Closes #132.