Few adjustments as in issue #10