Merged in jdh8/eigen (pull request PR-16)