Closed issues 10, 9, and 30