Fixed Issues #2 and #3