Viv Rajkumar Merge pull request #35 from krishnaIndia/self_enc_issue