Merge pull request #86 from liubrian/master

merge jeff's stuff, did a new pull request
Remove sp
fixing contact