a few adjustments; fixed search
Merge pull request #16 from jghezzi/jasons_branch

Jasons branch
Merge pull request #15 from jghezzi/jeremy_working

a few adjustments; fixed search
added sitter acceptance