Base Converter + Other code
Merge remote-tracking branch 'origin/BaseConverter+OtherStuff'