Merge pull request #2 from timcrain/master

LinSearch
Merge pull request #3 from timcrain/AmandaTest

Merge pull request #2 from timcrain/master