Issue #22

Small changes