Fixed Issue #31