Class naming update
Documentation improvement
Bug in output format for JPG set fixed