Issue #22 and #18
Issue #19 solved