Update #3

Fixed Issues #3 along with another unreported bug.