commiting #issue 19 and #20