Fixed Issues #18 and #19