Input functions updated
Merge branch 'Schneider' of https://github.com/wschneider/NetProgClient