still enoding issues
Merge pull request #102 from sarakha63/develop

still enoding issues