some design changes
Merge branch 'master' of https://github.com/patbuergin/first-responder