Fixing Issue 92

This closes #92.