Fixed Issue #110