Issue #10 - small improvements
Corrected little things