Fixed Issues #1 and #30