Merge pull request #215 from anilsaldhana/master

PLINK-190: roll back changes
Merge pull request #216 from anilsaldhana/master

PL-190: clean up