changes from main site
Merge branch 'master' of github.com:mcuringa/xma
turned contact brown
Merge branch 'master' of github.com:mcuringa/xma