Improved Heritability Estimation from Genome-wide SNPs