closed issues 4 and 5