Merge pull request #1 from brabbins/master

Updated to include searchable function and defaults
Merge pull request #1 from ubc/master

Merge pull request #1 from brabbins/master