Added options object
Merge branch 'master' of github.com:sonnyt/yellowpages