encode
Merge pull request #46 from safdarzeeshan/master

Master
Merge pull request #47 from safdarzeeshan/develop

encode hotfix