more changes
Merge branch 'master' of https://github.com/ejardim/a4a
local changes
erged conflicts
discussion first draft