Merge branch 'master' of https://github.com/lynxlab/ada.git
local configuration