fix those three bugs
fixed those three bugs
changed
remove add contact
merge
Merge pull request #86 from liubrian/master

merge jeff's stuff, did a new pull request