Merge pull request #16 from umpirsky/feature/settings

Settings
Merge pull request #15 from umpirsky/feature/assortment

Assortment
Updated addressing doc according to latest changes.