Added settings for smarty streets
Merge branch 'my'