ui-flow & unit tests
Merge pull request #1 from settinghead/master

ui-flow & unit tests