This version has some bug fixes

* Restore base encoding to read the files
* Minor fixes
