Fixed Issues #1, #2