v2.11.1: fix #1 and close #2. Generalized input sys.