address Issues #19 and #20