Issue #15, #19, #21 fixed.
Issue #10, #11, #14 implemented