more encoding
Merge branch 'master' of https://github.com/NEU-DSG/ECDA
Adding back the oddly deleted changes