Fixed Issue #125, Fixed Issue #126