Issue #110 - fixing bugs