Merge pull request #46 from pedroigor/master

[PLINK-374] AND [PLINK-375]