Better Heritage processing , fixed #140
Merge remote-tracking branch 'origin/master'