More stuff.
Merge branch 'master' of https://github.com/EliteTK/c-stuff

Merge.