More testing. X-val time I think
Merge branch 'master' of https://github.com/somanayr/LSP.git