Propagate changes per Erica
Merge branch 'master' of https://github.com/essamjoubori/e-kalltower
Merge branch 'master' of https://github.com/essamjoubori/e-kalltower
merged changes