Issue #23 solved
Issue #22 solved