closed issues 5, 6, 9, 15, 16.