merged2
merged4
merging almaa to master