Merge branch 'master' of github.com:AddisMap/BAME-tools