Fixes Issue #101