Modified various
Merge branch 'master' of https://github.com/hammbino/NCursesCS3060