Fix Issue #23 and list description