Fixed Issue #50