Merge branch 'salam-head'
Merge branch 'master' of https://github.com/homer/SalaamWorld