Merged Commaster's changes,

Also rebuilt for new binaries and changed my name in the code.