Closes Item #102